From f4ea37b2075a4f78d2c6c90e5496efbc1f5f390e Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Wed, 10 Mar 2004 16:07:13 +0000 Subject: [PATCH] bitkeeper revision 1.775 (404f3d312IPf2eSF1VGO0WBwqhqeaA) trace.h: new file Many files: Fix compile errors in Xen headers. --- .rootkeys | 1 + tools/examples/Makefile | 13 ----- tools/misc/Makefile | 8 +-- tools/xc/lib/Makefile | 3 +- tools/xc/lib/xc_private.h | 10 ++-- tools/xentrace/Makefile | 3 +- tools/xentrace/xentrace.c | 3 +- xen/Makefile | 3 +- xen/arch/i386/extable.c | 6 +-- xen/arch/i386/nmi.c | 20 ++++---- xen/arch/i386/pci-dma.c | 8 +-- xen/arch/i386/pci-i386.c | 12 ++--- xen/arch/i386/pci-irq.c | 16 +++--- xen/arch/i386/pci-pc.c | 14 ++--- xen/arch/i386/usercopy.c | 2 +- xen/common/brlock.c | 6 +-- xen/common/kernel.c | 2 +- xen/common/network.c | 2 +- xen/common/resource.c | 16 +++--- xen/common/string.c | 6 +-- xen/common/timer.c | 16 +++--- xen/drivers/block/cciss.h | 2 +- xen/drivers/block/cciss_scsi.c | 2 +- xen/drivers/char/keyboard.c | 2 +- xen/drivers/ide/ide-pci.c | 18 +++---- xen/drivers/ide/ide_modes.h | 2 +- xen/drivers/ide/piix.c | 22 ++++---- xen/drivers/message/fusion/isense.h | 6 +-- xen/drivers/message/fusion/linux_compat.h | 8 +-- xen/drivers/message/fusion/mptbase.h | 2 +- xen/drivers/message/fusion/mptscsih.h | 10 ++-- xen/drivers/message/fusion/scsi3.h | 2 +- xen/drivers/net/3c59x.c | 42 +++++++-------- xen/drivers/net/8139too.c | 32 ++++++------ xen/drivers/net/Space.c | 4 +- xen/drivers/net/e100/e100.h | 52 +++++++++---------- xen/drivers/net/e100/e100_config.c | 2 +- xen/drivers/net/e100/e100_config.h | 2 +- xen/drivers/net/e100/e100_eeprom.c | 2 +- xen/drivers/net/e100/e100_main.c | 10 ++-- xen/drivers/net/e100/e100_phy.c | 2 +- xen/drivers/net/e100/e100_phy.h | 2 +- xen/drivers/net/e100/e100_test.c | 2 +- xen/drivers/net/e100/e100_ucode.h | 2 +- xen/drivers/net/e1000/e1000.h | 60 +++++++++++----------- xen/drivers/net/e1000/e1000_ethtool.c | 2 +- xen/drivers/net/e1000/e1000_hw.c | 2 +- xen/drivers/net/e1000/e1000_hw.h | 2 +- xen/drivers/net/e1000/e1000_main.c | 4 +- xen/drivers/net/e1000/e1000_osdep.h | 12 ++--- xen/drivers/net/e1000/e1000_param.c | 2 +- xen/drivers/net/e1000/kcompat.c | 2 +- xen/drivers/net/e1000/kcompat.h | 26 +++++----- xen/drivers/net/net_init.c | 38 +++++++------- xen/drivers/net/pcnet32.c | 38 +++++++------- xen/drivers/net/setup.c | 10 ++-- xen/drivers/net/tg3.c | 42 +++++++-------- xen/drivers/net/tulip/21142.c | 4 +- xen/drivers/net/tulip/eeprom.c | 2 +- xen/drivers/net/tulip/interrupt.c | 6 +-- xen/drivers/net/tulip/media.c | 8 +-- xen/drivers/net/tulip/pnic.c | 2 +- xen/drivers/net/tulip/pnic2.c | 4 +- xen/drivers/net/tulip/tulip.h | 14 ++--- xen/drivers/net/tulip/tulip_core.c | 18 +++---- xen/drivers/pci/compat.c | 6 +-- xen/drivers/pci/names.c | 10 ++-- xen/drivers/pci/pci.c | 32 ++++++------ xen/drivers/pci/proc.c | 12 ++--- xen/drivers/pci/quirks.c | 12 ++--- xen/drivers/pci/setup-bus.c | 14 ++--- xen/drivers/pci/setup-irq.c | 12 ++--- xen/drivers/pci/setup-res.c | 14 ++--- xen/drivers/pci/syscall.c | 8 +-- xen/drivers/scsi/BusLogic.c | 28 +++++----- xen/drivers/scsi/BusLogic.h | 2 +- xen/drivers/scsi/FlashPoint.c.inc | 2 +- xen/drivers/scsi/aacraid/aachba.c | 22 ++++---- xen/drivers/scsi/aacraid/commctrl.c | 20 ++++---- xen/drivers/scsi/aacraid/comminit.c | 22 ++++---- xen/drivers/scsi/aacraid/commsup.c | 20 ++++---- xen/drivers/scsi/aacraid/dpcsup.c | 20 ++++---- xen/drivers/scsi/aacraid/linit.c | 22 ++++---- xen/drivers/scsi/aacraid/rx.c | 22 ++++---- xen/drivers/scsi/aacraid/sa.c | 22 ++++---- xen/drivers/scsi/constants.c | 2 +- xen/drivers/scsi/scsi_dma.c | 2 +- xen/drivers/scsi/scsi_ioctl.c | 10 ++-- xen/drivers/scsi/scsi_module.c.inc | 2 +- xen/drivers/scsi/scsi_obsolete.c | 24 ++++----- xen/drivers/scsi/scsi_scan.c | 2 +- xen/drivers/scsi/scsicam.c | 6 +-- xen/drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- xen/include/asm-i386/apic.h | 2 +- xen/include/asm-i386/byteorder.h | 4 +- xen/include/asm-i386/dma.h | 6 +-- xen/include/asm-i386/ide.h | 2 +- xen/include/asm-i386/io.h | 2 +- xen/include/asm-i386/pci.h | 8 +-- xen/include/asm-i386/string.h | 2 +- xen/include/asm-i386/timex.h | 2 +- xen/include/asm-i386/uaccess.h | 8 +-- xen/include/asm-x86_64/apic.h | 2 +- xen/include/asm-x86_64/byteorder.h | 2 +- xen/include/asm-x86_64/dma.h | 6 +-- xen/include/asm-x86_64/ide.h | 2 +- xen/include/asm-x86_64/io.h | 2 +- xen/include/asm-x86_64/page.h | 2 +- xen/include/asm-x86_64/pci.h | 8 +-- xen/include/asm-x86_64/pda.h | 2 +- xen/include/asm-x86_64/timex.h | 2 +- xen/include/asm-x86_64/uaccess.h | 8 +-- xen/include/hypervisor-ifs/trace.h | 35 +++++++++++++ xen/include/xeno/brlock.h | 6 +-- xen/include/xeno/byteorder/big_endian.h | 4 +- xen/include/xeno/byteorder/little_endian.h | 4 +- xen/include/xeno/byteorder/pdp_endian.h | 6 +-- xen/include/xeno/cdrom.h | 4 +- xen/include/xeno/crc32.h | 2 +- xen/include/xeno/etherdevice.h | 2 +- xen/include/xeno/genhd.h | 2 +- xen/include/xeno/hdreg.h | 2 +- xen/include/xeno/if.h | 4 +- xen/include/xeno/if_vlan.h | 4 +- xen/include/xeno/init.h | 2 +- xen/include/xeno/interrupt.h | 8 +-- xen/include/xeno/mii.h | 2 +- xen/include/xeno/module.h | 10 ++-- xen/include/xeno/notifier.h | 2 +- xen/include/xeno/pci.h | 12 ++--- xen/include/xeno/reboot.h | 2 +- xen/include/xeno/skbuff.h | 14 ++--- xen/include/xeno/socket.h | 6 +-- xen/include/xeno/spinlock.h | 2 +- xen/include/xeno/string.h | 4 +- xen/include/xeno/timer.h | 4 +- xen/include/xeno/tqueue.h | 4 +- xen/include/xeno/trace.h | 27 +--------- xen/net/dev.c | 36 ++++++------- xen/net/dev_mcast.c | 38 +++++++------- xen/net/devinit.c | 24 ++++----- xen/net/eth.c | 32 ++++++------ xen/net/skbuff.c | 24 ++++----- 143 files changed, 736 insertions(+), 734 deletions(-) create mode 100644 xen/include/hypervisor-ifs/trace.h diff --git a/.rootkeys b/.rootkeys index f077bc4255..0dfb9f395c 100644 --- a/.rootkeys +++ b/.rootkeys @@ -479,6 +479,7 @@ 3ddb79c25UE59iu4JJcbRalx95mvcg xen/include/hypervisor-ifs/hypervisor-if.h 3ead095dE_VF-QA88rl_5cWYRWtRVQ xen/include/hypervisor-ifs/kbd.h 3ddb79c2oRPrzClk3zbTkRHlpumzKA xen/include/hypervisor-ifs/network.h +404f3d2eR2Owk-ZcGOx9ULGHg3nrww xen/include/hypervisor-ifs/trace.h 3f0d22cbroqp_BkoDPwkfRJhaw1LiQ xen/include/hypervisor-ifs/vbd.h 3ddb79c4qbCoOFHrv9sCGshbWzBVlQ xen/include/scsi/scsi.h 3ddb79c4R4iVwqIIeychVQYmIH4FUg xen/include/scsi/scsi_ioctl.h diff --git a/tools/examples/Makefile b/tools/examples/Makefile index 0af1c854df..2170c22ca7 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -1,12 +1,4 @@ -CC = gcc -CFLAGS = -Wall -O3 -EXTRA_INC = -I../../xen/include -I../../xenolinux-sparse/include -I../xc/lib - -HDRS = $(wildcard *.h) -SRCS = $(wildcard *.c) -OBJS = $(patsubst %.c,%.o,$(SRCS)) - INSTALL = $(wildcard *.py) ETC = defaults democd netbsd INITD = xendomains @@ -32,8 +24,3 @@ dist: all install --mode=555 $(INITD) ../../../install/init.d clean: - - -%: %.c $(HDRS) Makefile - $(CC) $(CFLAGS) $(EXTRA_INC) -o $@ $< - diff --git a/tools/misc/Makefile b/tools/misc/Makefile index 6e394d8043..743f0f4402 100644 --- a/tools/misc/Makefile +++ b/tools/misc/Makefile @@ -1,7 +1,7 @@ - -CC = gcc -CFLAGS = -Wall -O3 -EXTRA_INC = -I../../xen/include -I../../xenolinux-sparse/include -I../xc/lib +CC = gcc +CFLAGS = -Wall -O3 +EXTRA_INC = -I../../xen/include/hypervisor-ifs +EXTRA_INC += -I../../xenolinux-sparse/include -I../xc/lib HDRS = $(wildcard *.h) SRCS = $(wildcard *.c) diff --git a/tools/xc/lib/Makefile b/tools/xc/lib/Makefile index 021d855dee..389c0958bc 100644 --- a/tools/xc/lib/Makefile +++ b/tools/xc/lib/Makefile @@ -5,7 +5,8 @@ SONAME = libxc.so.$(MAJOR) CC = gcc CFLAGS = -c -Wall -O3 -CFLAGS += -I../../../xen/include -I../../../xenolinux-sparse/include +CFLAGS += -I../../../xen/include/hypervisor-ifs +CFLAGS += -I../../../xenolinux-sparse/include HDRS = $(wildcard *.h) OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) diff --git a/tools/xc/lib/xc_private.h b/tools/xc/lib/xc_private.h index 6499c58872..d5ce8947ea 100644 --- a/tools/xc/lib/xc_private.h +++ b/tools/xc/lib/xc_private.h @@ -17,10 +17,12 @@ #include "xc.h" #include -#include -#include -#include -#include + +/* from xen/include/hypervisor-ifs */ +#include +#include +#include +#include #define _PAGE_PRESENT 0x001 #define _PAGE_RW 0x002 diff --git a/tools/xentrace/Makefile b/tools/xentrace/Makefile index 83dff0fa43..5758f6a2e7 100644 --- a/tools/xentrace/Makefile +++ b/tools/xentrace/Makefile @@ -1,7 +1,8 @@ CC = gcc CFLAGS = -Wall -O3 -CFLAGS += -I../../xen/include -I../../xenolinux-sparse/include +CFLAGS += -I../../xen/include/hypervisor-ifs +CFLAGS += -I../../xenolinux-sparse/include HDRS = $(wildcard *.h) OBJS = $(patsubst %.c,%.o,$(wildcard *.c)) diff --git a/tools/xentrace/xentrace.c b/tools/xentrace/xentrace.c index 73846f39d1..edfb907ebd 100644 --- a/tools/xentrace/xentrace.c +++ b/tools/xentrace/xentrace.c @@ -23,7 +23,8 @@ #include "../xc/lib/xc_private.h" -#include +/* from xen/include/hypervisor-ifs */ +#include extern FILE *stdout; diff --git a/xen/Makefile b/xen/Makefile index 10399a6311..e0203fa699 100644 --- a/xen/Makefile +++ b/xen/Makefile @@ -43,12 +43,11 @@ $(TARGET): delete-unfresh-files make-links $(GENERATED_FILES) $(MAKE) -C arch/$(ARCH) make-links: delete-links - ln -sf xeno include/linux ln -sf asm-$(ARCH) include/asm ln -sf arch-$(ARCH) include/hypervisor-ifs/arch delete-links: - rm -f include/linux include/asm include/hypervisor-ifs/arch + rm -f include/asm include/hypervisor-ifs/arch # Blow away kernel.o because build info is stored statically within it. delete-unfresh-files: diff --git a/xen/arch/i386/extable.c b/xen/arch/i386/extable.c index 4cd9f064c3..de65ff5f0d 100644 --- a/xen/arch/i386/extable.c +++ b/xen/arch/i386/extable.c @@ -2,9 +2,9 @@ * linux/arch/i386/mm/extable.c */ -#include -#include -#include +#include +#include +#include #include extern const struct exception_table_entry __start___ex_table[]; diff --git a/xen/arch/i386/nmi.c b/xen/arch/i386/nmi.c index 16aace462d..015a627074 100644 --- a/xen/arch/i386/nmi.c +++ b/xen/arch/i386/nmi.c @@ -12,16 +12,16 @@ * Keir Fraser : Pentium 4 Hyperthreading support */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/arch/i386/pci-dma.c b/xen/arch/i386/pci-dma.c index 9d19cea867..8bd184e18b 100644 --- a/xen/arch/i386/pci-dma.c +++ b/xen/arch/i386/pci-dma.c @@ -7,10 +7,10 @@ * in asm/pci.h. */ -#include -#include -#include -#include +#include +#include +#include +#include #include void *pci_alloc_consistent(struct pci_dev *hwdev, size_t size, diff --git a/xen/arch/i386/pci-i386.c b/xen/arch/i386/pci-i386.c index 7eca534aec..55074f2cf2 100644 --- a/xen/arch/i386/pci-i386.c +++ b/xen/arch/i386/pci-i386.c @@ -85,12 +85,12 @@ * Oct 8, 1999 : Split to pci-i386.c, pci-pc.c and pci-visws.c. [mj] */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include "pci-i386.h" diff --git a/xen/arch/i386/pci-irq.c b/xen/arch/i386/pci-irq.c index 2c68d9d3b3..bc3df821f3 100644 --- a/xen/arch/i386/pci-irq.c +++ b/xen/arch/i386/pci-irq.c @@ -4,14 +4,14 @@ * (c) 1999--2000 Martin Mares */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/xen/arch/i386/pci-pc.c b/xen/arch/i386/pci-pc.c index bb5ba8d299..eb8e19913e 100644 --- a/xen/arch/i386/pci-pc.c +++ b/xen/arch/i386/pci-pc.c @@ -4,13 +4,13 @@ * (c) 1999--2000 Martin Mares */ -#include -#include -/*#include */ -#include -#include -#include -#include +#include +#include +/*#include */ +#include +#include +#include +#include /*#include */ #include diff --git a/xen/arch/i386/usercopy.c b/xen/arch/i386/usercopy.c index 56322f1b56..0f3e08e9db 100644 --- a/xen/arch/i386/usercopy.c +++ b/xen/arch/i386/usercopy.c @@ -5,7 +5,7 @@ * Copyright 1997 Andi Kleen * Copyright 1997 Linus Torvalds */ -#include +#include #include //#include diff --git a/xen/common/brlock.c b/xen/common/brlock.c index e2bccec6a7..f3a74a0c99 100644 --- a/xen/common/brlock.c +++ b/xen/common/brlock.c @@ -8,12 +8,12 @@ * Copyright 2000, David S. Miller */ -#include +#include #ifdef CONFIG_SMP -#include -#include +#include +#include #ifdef __BRLOCK_USE_ATOMICS diff --git a/xen/common/kernel.c b/xen/common/kernel.c index 055316e7a7..b963c6f5e9 100644 --- a/xen/common/kernel.c +++ b/xen/common/kernel.c @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/xen/common/network.c b/xen/common/network.c index 9514745d45..d13c079e47 100644 --- a/xen/common/network.c +++ b/xen/common/network.c @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/xen/common/resource.c b/xen/common/resource.c index 406fb256a7..549da588c4 100644 --- a/xen/common/resource.c +++ b/xen/common/resource.c @@ -7,14 +7,14 @@ * Arbitrary resource management. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include struct resource ioport_resource = { "PCI IO", 0x0000, IO_SPACE_LIMIT, IORESOURCE_IO }; diff --git a/xen/common/string.c b/xen/common/string.c index 2a8bb66815..a8f5596a0f 100644 --- a/xen/common/string.c +++ b/xen/common/string.c @@ -15,9 +15,9 @@ * reentrant and should be faster). Use only strsep() in new code, please. */ -#include -#include -#include +#include +#include +#include #ifndef __HAVE_ARCH_STRNICMP /** diff --git a/xen/common/timer.c b/xen/common/timer.c index c0e7d3a393..f8cf731e9a 100644 --- a/xen/common/timer.c +++ b/xen/common/timer.c @@ -15,14 +15,14 @@ * 1999-03-10 Improved NTP compatibility by Ulrich Windl */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/xen/drivers/block/cciss.h b/xen/drivers/block/cciss.h index 1bf141281a..c69d3c5a68 100644 --- a/xen/drivers/block/cciss.h +++ b/xen/drivers/block/cciss.h @@ -1,7 +1,7 @@ #ifndef CCISS_H #define CCISS_H -#include +#include #include "cciss_cmd.h" diff --git a/xen/drivers/block/cciss_scsi.c b/xen/drivers/block/cciss_scsi.c index 1bc89c875e..a76d20f09a 100644 --- a/xen/drivers/block/cciss_scsi.c +++ b/xen/drivers/block/cciss_scsi.c @@ -31,7 +31,7 @@ #include "../scsi/scsi.h" #include "../scsi/hosts.h" #include -#include +#include #include "cciss_scsi.h" diff --git a/xen/drivers/char/keyboard.c b/xen/drivers/char/keyboard.c index 40fc68cbce..225aa175ec 100644 --- a/xen/drivers/char/keyboard.c +++ b/xen/drivers/char/keyboard.c @@ -14,7 +14,7 @@ #include #include -/* Hash-defines torn from and */ +/* Hash-defines torn from and */ #define KBD_STATUS_REG 0x64 /* Status register (R) */ #define KBD_CNTL_REG 0x64 /* Controller command register (W) */ diff --git a/xen/drivers/ide/ide-pci.c b/xen/drivers/ide/ide-pci.c index 76748259f8..7c5e692334 100644 --- a/xen/drivers/ide/ide-pci.c +++ b/xen/drivers/ide/ide-pci.c @@ -12,15 +12,15 @@ * configuration of all PCI IDE interfaces present in a system. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/drivers/ide/ide_modes.h b/xen/drivers/ide/ide_modes.h index 16b8cf123a..e8d7be152f 100644 --- a/xen/drivers/ide/ide_modes.h +++ b/xen/drivers/ide/ide_modes.h @@ -7,7 +7,7 @@ #ifndef _IDE_MODES_H #define _IDE_MODES_H -#include +#include /* * Shared data/functions for determining best PIO mode for an IDE drive. diff --git a/xen/drivers/ide/piix.c b/xen/drivers/ide/piix.c index fe538429f3..be2ba7ee1f 100644 --- a/xen/drivers/ide/piix.c +++ b/xen/drivers/ide/piix.c @@ -53,15 +53,15 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -72,8 +72,8 @@ #define DISPLAY_PIIX_TIMINGS #if defined(DISPLAY_PIIX_TIMINGS) && defined(CONFIG_PROC_FS) -#include -#include +#include +#include static int piix_get_info(char *, char **, off_t, int); extern int (*piix_display_info)(char *, char **, off_t, int); /* ide-proc.c */ diff --git a/xen/drivers/message/fusion/isense.h b/xen/drivers/message/fusion/isense.h index e1ce503fef..38799a77ad 100644 --- a/xen/drivers/message/fusion/isense.h +++ b/xen/drivers/message/fusion/isense.h @@ -3,9 +3,9 @@ /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ #ifdef __KERNEL__ -#include /* needed for u8, etc. */ -#include /* needed for strcat */ -#include /* needed for sprintf */ +#include /* needed for u8, etc. */ +#include /* needed for strcat */ +#include /* needed for sprintf */ #else #ifndef U_STUFF_DEFINED #define U_STUFF_DEFINED diff --git a/xen/drivers/message/fusion/linux_compat.h b/xen/drivers/message/fusion/linux_compat.h index 1a798550b4..8ad8925032 100644 --- a/xen/drivers/message/fusion/linux_compat.h +++ b/xen/drivers/message/fusion/linux_compat.h @@ -4,10 +4,10 @@ #define FUSION_LINUX_COMPAT_H /*{-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ -#include -#include -#include -#include +#include +#include +#include +#include /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ diff --git a/xen/drivers/message/fusion/mptbase.h b/xen/drivers/message/fusion/mptbase.h index 02e6e4d731..fb5544ee02 100644 --- a/xen/drivers/message/fusion/mptbase.h +++ b/xen/drivers/message/fusion/mptbase.h @@ -157,7 +157,7 @@ /* SAE: Xen doesn't have a proc filesystem */ #if defined(CONFIG_PROC_FS) -#include +#include #endif /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/ diff --git a/xen/drivers/message/fusion/mptscsih.h b/xen/drivers/message/fusion/mptscsih.h index eaa75beb3d..8f60d25ee7 100644 --- a/xen/drivers/message/fusion/mptscsih.h +++ b/xen/drivers/message/fusion/mptscsih.h @@ -155,7 +155,7 @@ struct mptscsih_driver_setup * Super HACK! -by sralston:-( * (good grief; heaven help me!) */ -# include +# include # if !defined(CAP_LEASE) && !defined(MODULE) # undef MPT_SCSIHOST_NEED_ENTRY_EXIT_HOOKUPS # endif @@ -168,12 +168,12 @@ struct mptscsih_driver_setup /* * tq_scheduler disappeared @ lk-2.4.0-test12 - * (right when newly defined TQ_ACTIVE) + * (right when newly defined TQ_ACTIVE) * tq_struct reworked in 2.5.41. Include workqueue.h. */ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,41) -# include -# include +# include +# include #define SCHEDULE_TASK(x) \ if (schedule_work(x) == 0) { \ /*MOD_DEC_USE_COUNT*/; \ @@ -181,7 +181,7 @@ struct mptscsih_driver_setup #else #define HAVE_TQ_SCHED 1 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) -# include +# include # ifdef TQ_ACTIVE # undef HAVE_TQ_SCHED # endif diff --git a/xen/drivers/message/fusion/scsi3.h b/xen/drivers/message/fusion/scsi3.h index 9160ba5e78..2e6934d7ec 100644 --- a/xen/drivers/message/fusion/scsi3.h +++ b/xen/drivers/message/fusion/scsi3.h @@ -21,7 +21,7 @@ * Includes */ #ifdef __KERNEL__ -#include +#include #else #ifndef U_STUFF_DEFINED #define U_STUFF_DEFINED diff --git a/xen/drivers/net/3c59x.c b/xen/drivers/net/3c59x.c index 9478920e5b..86c67dec50 100644 --- a/xen/drivers/net/3c59x.c +++ b/xen/drivers/net/3c59x.c @@ -224,26 +224,26 @@ static int vortex_debug = 1; #error You must compile this driver with "-O". #endif -#include -#include -#include -//#include -#include -//#include -#include -#include -//#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -//#include +#include +#include +#include +//#include +#include +//#include +#include +#include +//#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include #include /* For NR_IRQS only. */ #include #include @@ -262,7 +262,7 @@ static int vortex_debug = 1; #define RUN_AT(x) (jiffies + (x)) -#include +#include static char version[] __devinitdata = diff --git a/xen/drivers/net/8139too.c b/xen/drivers/net/8139too.c index 6b4606062b..ea8d74a523 100644 --- a/xen/drivers/net/8139too.c +++ b/xen/drivers/net/8139too.c @@ -96,30 +96,30 @@ #define DRV_VERSION "0.9.26" -#include -#include +#include +#include #ifdef XEN typedef int pid_t; -#include +#include #endif -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #ifndef XEN -#include +#include #endif -#include -#include -#include +#include +#include +#include #ifndef XEN -#include +#include #endif -#include +#include #include #include diff --git a/xen/drivers/net/Space.c b/xen/drivers/net/Space.c index 5724837106..66f3d4f055 100644 --- a/xen/drivers/net/Space.c +++ b/xen/drivers/net/Space.c @@ -11,8 +11,8 @@ * Fred N. van Kempen, * Donald J. Becker, */ -#include -#include +#include +#include /* * KAF (23/7/02): All the probe shit is gone from here -- each network diff --git a/xen/drivers/net/e100/e100.h b/xen/drivers/net/e100/e100.h index 456d2c7ec8..9bac4a7044 100644 --- a/xen/drivers/net/e100/e100.h +++ b/xen/drivers/net/e100/e100.h @@ -21,44 +21,44 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ #ifndef _E100_INC_ #define _E100_INC_ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ +#include #include #include #include -#include -/*#include */ +#include +/*#include */ #include -#include +#include #include -/*#include */ -#include -#include +/*#include */ +#include +#include #define yield() ((void)0) diff --git a/xen/drivers/net/e100/e100_config.c b/xen/drivers/net/e100/e100_config.c index d9df35677a..1118f65745 100644 --- a/xen/drivers/net/e100/e100_config.c +++ b/xen/drivers/net/e100/e100_config.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e100/e100_config.h b/xen/drivers/net/e100/e100_config.h index 5d1e194ff2..35fb53e12e 100644 --- a/xen/drivers/net/e100/e100_config.h +++ b/xen/drivers/net/e100/e100_config.h @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e100/e100_eeprom.c b/xen/drivers/net/e100/e100_eeprom.c index ff843e161b..cd3dec4447 100644 --- a/xen/drivers/net/e100/e100_eeprom.c +++ b/xen/drivers/net/e100/e100_eeprom.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e100/e100_main.c b/xen/drivers/net/e100/e100_main.c index b2870e6c5b..2314ed3c17 100644 --- a/xen/drivers/net/e100/e100_main.c +++ b/xen/drivers/net/e100/e100_main.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ @@ -78,10 +78,10 @@ * 2.1.24 10/7/02 */ -#include +#include /*#include */ -/*#include */ -/*#include */ +/*#include */ +/*#include */ #include "e100.h" #include "e100_ucode.h" #include "e100_config.h" @@ -379,7 +379,7 @@ static inline tcb_t *e100_prepare_xmit_buff(struct e100_private *, struct sk_buff *); static void e100_set_multi_exec(struct net_device *dev); -MODULE_AUTHOR("Intel Corporation, "); +MODULE_AUTHOR("Intel Corporation, "); MODULE_DESCRIPTION("Intel(R) PRO/100 Network Driver"); MODULE_LICENSE("GPL"); diff --git a/xen/drivers/net/e100/e100_phy.c b/xen/drivers/net/e100/e100_phy.c index 08782934bd..76ad3c4e88 100644 --- a/xen/drivers/net/e100/e100_phy.c +++ b/xen/drivers/net/e100/e100_phy.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e100/e100_phy.h b/xen/drivers/net/e100/e100_phy.h index df2d483e67..aff38fe586 100644 --- a/xen/drivers/net/e100/e100_phy.h +++ b/xen/drivers/net/e100/e100_phy.h @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e100/e100_test.c b/xen/drivers/net/e100/e100_test.c index 0ff7266ef8..cdbb1bdfb8 100644 --- a/xen/drivers/net/e100/e100_test.c +++ b/xen/drivers/net/e100/e100_test.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e100/e100_ucode.h b/xen/drivers/net/e100/e100_ucode.h index ccbcd05583..8a18b953f9 100644 --- a/xen/drivers/net/e100/e100_ucode.h +++ b/xen/drivers/net/e100/e100_ucode.h @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e1000/e1000.h b/xen/drivers/net/e1000/e1000.h index efcbf8419b..ed6fee3f88 100644 --- a/xen/drivers/net/e1000/e1000.h +++ b/xen/drivers/net/e1000/e1000.h @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ @@ -32,48 +32,48 @@ #ifndef _E1000_H_ #define _E1000_H_ -//#include -#include -#include -#include +//#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -//#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include #include #include #include -//#include -#include -//#include -//#include -//#include +//#include +#include +//#include +//#include +//#include //#include -#include -#include +#include +#include #ifdef NETIF_F_TSO #include #endif #ifdef SIOCGMIIPHY -#include +#include #endif #ifdef SIOCETHTOOL -#include +#include #endif #ifdef NETIF_F_HW_VLAN_TX -#include +#include #endif #define BAR_0 0 diff --git a/xen/drivers/net/e1000/e1000_ethtool.c b/xen/drivers/net/e1000/e1000_ethtool.c index fdfaa80733..2b41739049 100644 --- a/xen/drivers/net/e1000/e1000_ethtool.c +++ b/xen/drivers/net/e1000/e1000_ethtool.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e1000/e1000_hw.c b/xen/drivers/net/e1000/e1000_hw.c index 303651e115..5a390e879d 100644 --- a/xen/drivers/net/e1000/e1000_hw.c +++ b/xen/drivers/net/e1000/e1000_hw.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e1000/e1000_hw.h b/xen/drivers/net/e1000/e1000_hw.h index 4976a3c084..34755a450d 100644 --- a/xen/drivers/net/e1000/e1000_hw.h +++ b/xen/drivers/net/e1000/e1000_hw.h @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e1000/e1000_main.c b/xen/drivers/net/e1000/e1000_main.c index 4b29541b8d..e4b0e411ec 100644 --- a/xen/drivers/net/e1000/e1000_main.c +++ b/xen/drivers/net/e1000/e1000_main.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ @@ -204,7 +204,7 @@ static struct pci_driver e1000_driver = { #endif }; -MODULE_AUTHOR("Intel Corporation, "); +MODULE_AUTHOR("Intel Corporation, "); MODULE_DESCRIPTION("Intel(R) PRO/1000 Network Driver"); MODULE_LICENSE("GPL"); diff --git a/xen/drivers/net/e1000/e1000_osdep.h b/xen/drivers/net/e1000/e1000_osdep.h index 649a010412..38810ee4b1 100644 --- a/xen/drivers/net/e1000/e1000_osdep.h +++ b/xen/drivers/net/e1000/e1000_osdep.h @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ @@ -34,12 +34,12 @@ #ifndef _E1000_OSDEP_H_ #define _E1000_OSDEP_H_ -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include "kcompat.h" #define usec_delay(x) udelay(x) diff --git a/xen/drivers/net/e1000/e1000_param.c b/xen/drivers/net/e1000/e1000_param.c index d57f9ff558..7516296714 100644 --- a/xen/drivers/net/e1000/e1000_param.c +++ b/xen/drivers/net/e1000/e1000_param.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e1000/kcompat.c b/xen/drivers/net/e1000/kcompat.c index 384b1f782f..d461c13bca 100644 --- a/xen/drivers/net/e1000/kcompat.c +++ b/xen/drivers/net/e1000/kcompat.c @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ diff --git a/xen/drivers/net/e1000/kcompat.h b/xen/drivers/net/e1000/kcompat.h index 602b840361..a96824af68 100644 --- a/xen/drivers/net/e1000/kcompat.h +++ b/xen/drivers/net/e1000/kcompat.h @@ -21,7 +21,7 @@ file called LICENSE. Contact Information: - Linux NICS + Linux NICS Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 *******************************************************************************/ @@ -29,17 +29,17 @@ #ifndef _KCOMPAT_H_ #define _KCOMPAT_H_ -#include -#include -#include -#include -#include -#include -#include -#include -//#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include +#include +#include #include #ifndef IRQ_HANDLED @@ -296,7 +296,7 @@ static inline void _kc_synchronize_irq() { synchronize_irq(); } #undef synchronize_irq #define synchronize_irq(X) _kc_synchronize_irq() -#include +#include #define work_struct tq_struct #define INIT_WORK INIT_TQUEUE #define schedule_work schedule_task diff --git a/xen/drivers/net/net_init.c b/xen/drivers/net/net_init.c index 49300a8d01..515d83411c 100644 --- a/xen/drivers/net/net_init.c +++ b/xen/drivers/net/net_init.c @@ -33,25 +33,25 @@ */ -#include -#include -#include -//#include -#include -#include -//#include -#include -#include -#include -#include -#include -//#include -//#include -//#include -//#include -//#include -//#include -//#include +#include +#include +#include +//#include +#include +#include +//#include +#include +#include +#include +#include +#include +//#include +//#include +//#include +//#include +//#include +//#include +//#include //#include #define rtnl_lock() ((void)0) diff --git a/xen/drivers/net/pcnet32.c b/xen/drivers/net/pcnet32.c index 3c1c65a2e0..ebc49f47e4 100644 --- a/xen/drivers/net/pcnet32.c +++ b/xen/drivers/net/pcnet32.c @@ -29,30 +29,30 @@ static const char *version = DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " tsbogend@alpha.franken.de\n"; -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #undef TX_RING_SIZE #undef RX_RING_SIZE diff --git a/xen/drivers/net/setup.c b/xen/drivers/net/setup.c index 1352a1cb4b..8ea35dc9a6 100644 --- a/xen/drivers/net/setup.c +++ b/xen/drivers/net/setup.c @@ -3,11 +3,11 @@ * New style setup code for the network devices */ -#include -#include -#include -#include -//#include +#include +#include +#include +#include +//#include extern int slip_init_ctrl_dev(void); extern int x25_asy_init_ctrl_dev(void); diff --git a/xen/drivers/net/tg3.c b/xen/drivers/net/tg3.c index 8b36e4d29b..d9a87b06f4 100644 --- a/xen/drivers/net/tg3.c +++ b/xen/drivers/net/tg3.c @@ -5,27 +5,27 @@ * Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com) */ -#include - -#include - -#include -#include -#include // Xen -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -//#include -//#include +#include + +#include + +#include +#include +#include // Xen +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +//#include +//#include //#include diff --git a/xen/drivers/net/tulip/21142.c b/xen/drivers/net/tulip/21142.c index b5686b66cd..f13fd4b94e 100644 --- a/xen/drivers/net/tulip/21142.c +++ b/xen/drivers/net/tulip/21142.c @@ -15,8 +15,8 @@ */ #include "tulip.h" -#include -#include +#include +#include static u16 t21142_csr13[] = { 0x0001, 0x0009, 0x0009, 0x0000, 0x0001, }; diff --git a/xen/drivers/net/tulip/eeprom.c b/xen/drivers/net/tulip/eeprom.c index a48a98b831..76458b4502 100644 --- a/xen/drivers/net/tulip/eeprom.c +++ b/xen/drivers/net/tulip/eeprom.c @@ -15,7 +15,7 @@ */ #include "tulip.h" -#include +#include #include diff --git a/xen/drivers/net/tulip/interrupt.c b/xen/drivers/net/tulip/interrupt.c index 25f27b4134..4a3b5fe5ab 100644 --- a/xen/drivers/net/tulip/interrupt.c +++ b/xen/drivers/net/tulip/interrupt.c @@ -15,9 +15,9 @@ */ #include "tulip.h" -#include -#include -#include +#include +#include +#include int tulip_rx_copybreak; diff --git a/xen/drivers/net/tulip/media.c b/xen/drivers/net/tulip/media.c index 8086cba616..9a8bc3574e 100644 --- a/xen/drivers/net/tulip/media.c +++ b/xen/drivers/net/tulip/media.c @@ -14,10 +14,10 @@ */ -#include -#include -#include -#include +#include +#include +#include +#include #include "tulip.h" diff --git a/xen/drivers/net/tulip/pnic.c b/xen/drivers/net/tulip/pnic.c index 1aa6ad7354..74d0ba00f1 100644 --- a/xen/drivers/net/tulip/pnic.c +++ b/xen/drivers/net/tulip/pnic.c @@ -14,7 +14,7 @@ */ -#include +#include #include "tulip.h" diff --git a/xen/drivers/net/tulip/pnic2.c b/xen/drivers/net/tulip/pnic2.c index 9bd92b1e7d..0d9e35236f 100644 --- a/xen/drivers/net/tulip/pnic2.c +++ b/xen/drivers/net/tulip/pnic2.c @@ -77,8 +77,8 @@ #include "tulip.h" -#include -#include +#include +#include void pnic2_timer(unsigned long data) diff --git a/xen/drivers/net/tulip/tulip.h b/xen/drivers/net/tulip/tulip.h index ca519fe8c0..24e37c4500 100644 --- a/xen/drivers/net/tulip/tulip.h +++ b/xen/drivers/net/tulip/tulip.h @@ -16,13 +16,13 @@ #ifndef __NET_TULIP_H__ #define __NET_TULIP_H__ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/drivers/net/tulip/tulip_core.c b/xen/drivers/net/tulip/tulip_core.c index 2611a825b7..3163c13d2e 100644 --- a/xen/drivers/net/tulip/tulip_core.c +++ b/xen/drivers/net/tulip/tulip_core.c @@ -18,16 +18,16 @@ #define DRV_VERSION "0.9.15-pre12" #define DRV_RELDATE "Aug 9, 2002" -#include -#include +#include +#include #include "tulip.h" -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/drivers/pci/compat.c b/xen/drivers/pci/compat.c index e035f860ea..795ce8d0f1 100644 --- a/xen/drivers/pci/compat.c +++ b/xen/drivers/pci/compat.c @@ -6,9 +6,9 @@ * Copyright 1998--2000 Martin Mares */ -#include -//#include -#include +#include +//#include +#include int pcibios_present(void) diff --git a/xen/drivers/pci/names.c b/xen/drivers/pci/names.c index 80674543b0..db4b8d5696 100644 --- a/xen/drivers/pci/names.c +++ b/xen/drivers/pci/names.c @@ -5,11 +5,11 @@ * David Mosberger-Tang, Martin Mares */ -#include -#include -/*#include */ -#include -#include +#include +#include +/*#include */ +#include +#include #ifdef CONFIG_PCI_NAMES diff --git a/xen/drivers/pci/pci.c b/xen/drivers/pci/pci.c index 30b18ed96c..a478610564 100644 --- a/xen/drivers/pci/pci.c +++ b/xen/drivers/pci/pci.c @@ -9,22 +9,22 @@ * Copyright 1997 -- 2000 Martin Mares */ -#include -#include -#include -#include -/*#include */ -#include -/*#include */ -#include -#include -#include -#include -/*#include */ -/*#include */ /* for hotplug_path */ -/*#include */ -#include -#include +#include +#include +#include +#include +/*#include */ +#include +/*#include */ +#include +#include +#include +#include +/*#include */ +/*#include */ /* for hotplug_path */ +/*#include */ +#include +#include #include /*#include */ /* isa_dma_bridge_buggy */ diff --git a/xen/drivers/pci/proc.c b/xen/drivers/pci/proc.c index 5e04ad7b33..a6c98046e3 100644 --- a/xen/drivers/pci/proc.c +++ b/xen/drivers/pci/proc.c @@ -6,12 +6,12 @@ * Copyright (c) 1997--1999 Martin Mares */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/xen/drivers/pci/quirks.c b/xen/drivers/pci/quirks.c index af7b7999c0..b3f4138800 100644 --- a/xen/drivers/pci/quirks.c +++ b/xen/drivers/pci/quirks.c @@ -12,12 +12,12 @@ * use the PowerTweak utility (see http://powertweak.sourceforge.net). */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #undef DEBUG diff --git a/xen/drivers/pci/setup-bus.c b/xen/drivers/pci/setup-bus.c index 22e7075171..0790d96684 100644 --- a/xen/drivers/pci/setup-bus.c +++ b/xen/drivers/pci/setup-bus.c @@ -17,13 +17,13 @@ * tighter packing. Prefetchable range support. */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #define DEBUG_CONFIG 1 diff --git a/xen/drivers/pci/setup-irq.c b/xen/drivers/pci/setup-irq.c index 4c65b2e98d..dae3b502ad 100644 --- a/xen/drivers/pci/setup-irq.c +++ b/xen/drivers/pci/setup-irq.c @@ -10,12 +10,12 @@ */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #define DEBUG_CONFIG 0 diff --git a/xen/drivers/pci/setup-res.c b/xen/drivers/pci/setup-res.c index bc27b906b4..5c36a6f443 100644 --- a/xen/drivers/pci/setup-res.c +++ b/xen/drivers/pci/setup-res.c @@ -16,13 +16,13 @@ * Resource sorting */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #define DEBUG_CONFIG 0 diff --git a/xen/drivers/pci/syscall.c b/xen/drivers/pci/syscall.c index c935efd9a9..8a534610c8 100644 --- a/xen/drivers/pci/syscall.c +++ b/xen/drivers/pci/syscall.c @@ -7,10 +7,10 @@ * magic northbridge registers.. */ -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/xen/drivers/scsi/BusLogic.c b/xen/drivers/scsi/BusLogic.c index 83f4b8cb8e..86263ee1e9 100644 --- a/xen/drivers/scsi/BusLogic.c +++ b/xen/drivers/scsi/BusLogic.c @@ -30,20 +30,20 @@ #define BusLogic_DriverDate "17 August 1998" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ +#include +#include #include #include #include diff --git a/xen/drivers/scsi/BusLogic.h b/xen/drivers/scsi/BusLogic.h index b0e1bd755f..5196ccf66f 100644 --- a/xen/drivers/scsi/BusLogic.h +++ b/xen/drivers/scsi/BusLogic.h @@ -26,7 +26,7 @@ */ -#include +#include /* diff --git a/xen/drivers/scsi/FlashPoint.c.inc b/xen/drivers/scsi/FlashPoint.c.inc index 9b07421da5..bd473a977f 100644 --- a/xen/drivers/scsi/FlashPoint.c.inc +++ b/xen/drivers/scsi/FlashPoint.c.inc @@ -16,7 +16,7 @@ */ -#include +#include #ifndef CONFIG_SCSI_OMIT_FLASHPOINT diff --git a/xen/drivers/scsi/aacraid/aachba.c b/xen/drivers/scsi/aacraid/aachba.c index 91153460e8..0329cb0665 100644 --- a/xen/drivers/scsi/aacraid/aachba.c +++ b/xen/drivers/scsi/aacraid/aachba.c @@ -22,20 +22,20 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ /*#include */ #include #define MAJOR_NR SCSI_DISK0_MAJOR /* For DEVICE_NR() */ -#include +#include #include "scsi.h" #include "hosts.h" #include "sd.h" diff --git a/xen/drivers/scsi/aacraid/commctrl.c b/xen/drivers/scsi/aacraid/commctrl.c index 2169d34f43..0572c3b048 100644 --- a/xen/drivers/scsi/aacraid/commctrl.c +++ b/xen/drivers/scsi/aacraid/commctrl.c @@ -28,16 +28,16 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ -#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ +#include /*#include */ #include #include "scsi.h" diff --git a/xen/drivers/scsi/aacraid/comminit.c b/xen/drivers/scsi/aacraid/comminit.c index 531361e55d..c58d67b9b4 100644 --- a/xen/drivers/scsi/aacraid/comminit.c +++ b/xen/drivers/scsi/aacraid/comminit.c @@ -29,17 +29,17 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ +#include /*#include */ #include "scsi.h" #include "hosts.h" diff --git a/xen/drivers/scsi/aacraid/commsup.c b/xen/drivers/scsi/aacraid/commsup.c index 4450dcbe8b..2238dcee19 100644 --- a/xen/drivers/scsi/aacraid/commsup.c +++ b/xen/drivers/scsi/aacraid/commsup.c @@ -31,17 +31,17 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ /*#include */ -#include +#include #include #include diff --git a/xen/drivers/scsi/aacraid/dpcsup.c b/xen/drivers/scsi/aacraid/dpcsup.c index fab58f32de..dd5865ca4b 100644 --- a/xen/drivers/scsi/aacraid/dpcsup.c +++ b/xen/drivers/scsi/aacraid/dpcsup.c @@ -29,16 +29,16 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ -#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ +#include /*#include */ #include "scsi.h" #include "hosts.h" diff --git a/xen/drivers/scsi/aacraid/linit.c b/xen/drivers/scsi/aacraid/linit.c index f68872d7f2..b68c1a4a5c 100644 --- a/xen/drivers/scsi/aacraid/linit.c +++ b/xen/drivers/scsi/aacraid/linit.c @@ -38,18 +38,18 @@ #define AAC_DRIVER_VERSION "1.1.2" #define AAC_DRIVER_BUILD_DATE __DATE__ " " __TIME__ -#include -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ /*#include */ -#include +#include #include "scsi.h" #include "hosts.h" diff --git a/xen/drivers/scsi/aacraid/rx.c b/xen/drivers/scsi/aacraid/rx.c index 0cb17691d1..2a545437d7 100644 --- a/xen/drivers/scsi/aacraid/rx.c +++ b/xen/drivers/scsi/aacraid/rx.c @@ -28,17 +28,17 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ /*#include */ #include "scsi.h" #include "hosts.h" diff --git a/xen/drivers/scsi/aacraid/sa.c b/xen/drivers/scsi/aacraid/sa.c index 9a453176df..8ea49df6a4 100644 --- a/xen/drivers/scsi/aacraid/sa.c +++ b/xen/drivers/scsi/aacraid/sa.c @@ -28,17 +28,17 @@ * */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -/*#include */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +/*#include */ /*#include */ #include "scsi.h" #include "hosts.h" diff --git a/xen/drivers/scsi/constants.c b/xen/drivers/scsi/constants.c index aea16f77d9..6399a11e5a 100644 --- a/xen/drivers/scsi/constants.c +++ b/xen/drivers/scsi/constants.c @@ -10,7 +10,7 @@ #include #include -/*#include */ +/*#include */ #include "scsi.h" #include "hosts.h" diff --git a/xen/drivers/scsi/scsi_dma.c b/xen/drivers/scsi/scsi_dma.c index 94c2118da0..0968ea447e 100644 --- a/xen/drivers/scsi/scsi_dma.c +++ b/xen/drivers/scsi/scsi_dma.c @@ -16,7 +16,7 @@ #include "constants.h" #ifdef CONFIG_KMOD -#include +#include #endif /* diff --git a/xen/drivers/scsi/scsi_ioctl.c b/xen/drivers/scsi/scsi_ioctl.c index 7f1df6e8f1..8cb506a3ea 100644 --- a/xen/drivers/scsi/scsi_ioctl.c +++ b/xen/drivers/scsi/scsi_ioctl.c @@ -12,12 +12,12 @@ #include #include -/* #include */ -/* #include */ -/* #include */ +/* #include */ +/* #include */ +/* #include */ #include -/* #include */ -/* #include */ +/* #include */ +/* #include */ #include #include "scsi.h" diff --git a/xen/drivers/scsi/scsi_module.c.inc b/xen/drivers/scsi/scsi_module.c.inc index 8a503da798..e43302189a 100644 --- a/xen/drivers/scsi/scsi_module.c.inc +++ b/xen/drivers/scsi/scsi_module.c.inc @@ -30,7 +30,7 @@ */ #include -#include +#include extern int scsi_register_module(int, void *); extern int scsi_unregister_module(int, void *); diff --git a/xen/drivers/scsi/scsi_obsolete.c b/xen/drivers/scsi/scsi_obsolete.c index d5309d2669..4ab56522de 100644 --- a/xen/drivers/scsi/scsi_obsolete.c +++ b/xen/drivers/scsi/scsi_obsolete.c @@ -47,18 +47,18 @@ */ #define __NO_VERSION__ -#include - -#include -#include -#include -#include -#include -#include -/*#include */ -#include -#include -#include +#include + +#include +#include +#include +#include +#include +#include +/*#include */ +#include +#include +#include #include #include diff --git a/xen/drivers/scsi/scsi_scan.c b/xen/drivers/scsi/scsi_scan.c index 04f4715992..b48f4fe004 100644 --- a/xen/drivers/scsi/scsi_scan.c +++ b/xen/drivers/scsi/scsi_scan.c @@ -20,7 +20,7 @@ #include "constants.h" #ifdef CONFIG_KMOD -#include +#include #endif /* diff --git a/xen/drivers/scsi/scsicam.c b/xen/drivers/scsi/scsicam.c index ae13d27cdc..7f1ebd33c5 100644 --- a/xen/drivers/scsi/scsicam.c +++ b/xen/drivers/scsi/scsicam.c @@ -16,10 +16,10 @@ #include -/*#include */ -/*#include */ +/*#include */ +/*#include */ #include -/*#include */ +/*#include */ #include #include "scsi.h" #include "hosts.h" diff --git a/xen/drivers/scsi/sym53c8xx_2/sym_glue.c b/xen/drivers/scsi/sym53c8xx_2/sym_glue.c index 23db7c2ce0..087de8ec94 100644 --- a/xen/drivers/scsi/sym53c8xx_2/sym_glue.c +++ b/xen/drivers/scsi/sym53c8xx_2/sym_glue.c @@ -51,7 +51,7 @@ */ #define SYM_GLUE_C -#include +#include #include "sym_glue.h" #define NAME53C "sym53c" diff --git a/xen/include/asm-i386/apic.h b/xen/include/asm-i386/apic.h index 705942596c..5fa65fbb19 100644 --- a/xen/include/asm-i386/apic.h +++ b/xen/include/asm-i386/apic.h @@ -1,7 +1,7 @@ #ifndef __ASM_APIC_H #define __ASM_APIC_H -#include +#include #include #include #include diff --git a/xen/include/asm-i386/byteorder.h b/xen/include/asm-i386/byteorder.h index bbfb629fae..74b88b975f 100644 --- a/xen/include/asm-i386/byteorder.h +++ b/xen/include/asm-i386/byteorder.h @@ -7,7 +7,7 @@ /* For avoiding bswap on i386 */ #ifdef __KERNEL__ -#include +#include #endif static __inline__ __const__ __u32 ___arch__swab32(__u32 x) @@ -42,6 +42,6 @@ static __inline__ __const__ __u16 ___arch__swab16(__u16 x) #endif /* __GNUC__ */ -#include +#include #endif /* _I386_BYTEORDER_H */ diff --git a/xen/include/asm-i386/dma.h b/xen/include/asm-i386/dma.h index f24c90a7bd..06ca344ab4 100644 --- a/xen/include/asm-i386/dma.h +++ b/xen/include/asm-i386/dma.h @@ -8,10 +8,10 @@ #ifndef _ASM_DMA_H #define _ASM_DMA_H -#include -#include /* And spinlocks */ +#include +#include /* And spinlocks */ #include /* need byte IO */ -#include +#include #ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER diff --git a/xen/include/asm-i386/ide.h b/xen/include/asm-i386/ide.h index 6642abf467..c7fa6b21f0 100644 --- a/xen/include/asm-i386/ide.h +++ b/xen/include/asm-i386/ide.h @@ -13,7 +13,7 @@ #ifdef __KERNEL__ -#include +#include #ifndef MAX_HWIFS # ifdef CONFIG_BLK_DEV_IDEPCI diff --git a/xen/include/asm-i386/io.h b/xen/include/asm-i386/io.h index 8260e8de95..79d75924d0 100644 --- a/xen/include/asm-i386/io.h +++ b/xen/include/asm-i386/io.h @@ -6,7 +6,7 @@ #define IO_SPACE_LIMIT 0xffff -/*#include */ +/*#include */ /* * Temporary debugging check to catch old code using diff --git a/xen/include/asm-i386/pci.h b/xen/include/asm-i386/pci.h index a38bef4986..c6be1fd992 100644 --- a/xen/include/asm-i386/pci.h +++ b/xen/include/asm-i386/pci.h @@ -1,7 +1,7 @@ #ifndef __i386_PCI_H #define __i386_PCI_H -#include +#include #ifdef __KERNEL__ @@ -28,10 +28,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq); * i386 has everything mapped statically. */ -#include -#include +#include +#include #include -/*#include */ +/*#include */ #include struct pci_dev; diff --git a/xen/include/asm-i386/string.h b/xen/include/asm-i386/string.h index 385da59b5c..5d24754f2a 100644 --- a/xen/include/asm-i386/string.h +++ b/xen/include/asm-i386/string.h @@ -2,7 +2,7 @@ #define _I386_STRING_H_ #ifdef __KERNEL__ -#include +#include /* * On a 486 or Pentium, we are better off not using the * byte string operations. But on a 386 or a PPro the diff --git a/xen/include/asm-i386/timex.h b/xen/include/asm-i386/timex.h index 3eeb5d2b70..baeb85194d 100644 --- a/xen/include/asm-i386/timex.h +++ b/xen/include/asm-i386/timex.h @@ -6,7 +6,7 @@ #ifndef _ASMi386_TIMEX_H #define _ASMi386_TIMEX_H -#include +#include #include #ifdef CONFIG_MELAN diff --git a/xen/include/asm-i386/uaccess.h b/xen/include/asm-i386/uaccess.h index ba19cfb2b3..bd1dae1503 100644 --- a/xen/include/asm-i386/uaccess.h +++ b/xen/include/asm-i386/uaccess.h @@ -4,10 +4,10 @@ /* * User space memory access functions */ -#include -#include -#include -#include +#include +#include +#include +#include #include #define VERIFY_READ 0 diff --git a/xen/include/asm-x86_64/apic.h b/xen/include/asm-x86_64/apic.h index 0bf81715ba..ba7f343a61 100644 --- a/xen/include/asm-x86_64/apic.h +++ b/xen/include/asm-x86_64/apic.h @@ -1,7 +1,7 @@ #ifndef __ASM_APIC_H #define __ASM_APIC_H -#include +#include #include #include #include diff --git a/xen/include/asm-x86_64/byteorder.h b/xen/include/asm-x86_64/byteorder.h index daef6afb4f..ff06e1d22b 100644 --- a/xen/include/asm-x86_64/byteorder.h +++ b/xen/include/asm-x86_64/byteorder.h @@ -27,6 +27,6 @@ static __inline__ __const__ __u32 ___arch__swab32(__u32 x) #define __BYTEORDER_HAS_U64__ -#include +#include #endif /* _X86_64_BYTEORDER_H */ diff --git a/xen/include/asm-x86_64/dma.h b/xen/include/asm-x86_64/dma.h index f24c90a7bd..06ca344ab4 100644 --- a/xen/include/asm-x86_64/dma.h +++ b/xen/include/asm-x86_64/dma.h @@ -8,10 +8,10 @@ #ifndef _ASM_DMA_H #define _ASM_DMA_H -#include -#include /* And spinlocks */ +#include +#include /* And spinlocks */ #include /* need byte IO */ -#include +#include #ifdef HAVE_REALLY_SLOW_DMA_CONTROLLER diff --git a/xen/include/asm-x86_64/ide.h b/xen/include/asm-x86_64/ide.h index 1281bb3b4f..b609465207 100644 --- a/xen/include/asm-x86_64/ide.h +++ b/xen/include/asm-x86_64/ide.h @@ -13,7 +13,7 @@ #ifdef __KERNEL__ -#include +#include #ifndef MAX_HWIFS # ifdef CONFIG_BLK_DEV_IDEPCI diff --git a/xen/include/asm-x86_64/io.h b/xen/include/asm-x86_64/io.h index 914ee889d6..21c22876a2 100644 --- a/xen/include/asm-x86_64/io.h +++ b/xen/include/asm-x86_64/io.h @@ -1,7 +1,7 @@ #ifndef _ASM_IO_H #define _ASM_IO_H -#include +#include /* * This file contains the definitions for the x86 IO instructions diff --git a/xen/include/asm-x86_64/page.h b/xen/include/asm-x86_64/page.h index 256f877078..b016b635b2 100644 --- a/xen/include/asm-x86_64/page.h +++ b/xen/include/asm-x86_64/page.h @@ -191,7 +191,7 @@ extern void paging_init(void); #define __flush_tlb_one(__addr) \ __asm__ __volatile__("invlpg %0": :"m" (*(char *) (__addr))) -#include +#include /* * Tell the user there is some problem. The exception handler decodes this frame. diff --git a/xen/include/asm-x86_64/pci.h b/xen/include/asm-x86_64/pci.h index df9889d0fe..5c931adb36 100644 --- a/xen/include/asm-x86_64/pci.h +++ b/xen/include/asm-x86_64/pci.h @@ -1,7 +1,7 @@ #ifndef __x8664_PCI_H #define __x8664_PCI_H -#include +#include #include @@ -24,10 +24,10 @@ void pcibios_penalize_isa_irq(int irq); struct irq_routing_table *pcibios_get_irq_routing_table(void); int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq); -#include -#include +#include +#include #include -/*#include */ +/*#include */ #include #include #include diff --git a/xen/include/asm-x86_64/pda.h b/xen/include/asm-x86_64/pda.h index a2223a5925..134d2fb9bf 100644 --- a/xen/include/asm-x86_64/pda.h +++ b/xen/include/asm-x86_64/pda.h @@ -1,7 +1,7 @@ #ifndef X86_64_PDA_H #define X86_64_PDA_H -#include +#include /* Per processor datastructure. %gs points to it while the kernel runs */ /* To use a new field with the *_pda macros it needs to be added to tools/offset.c */ diff --git a/xen/include/asm-x86_64/timex.h b/xen/include/asm-x86_64/timex.h index d235040e4e..29f4651c34 100644 --- a/xen/include/asm-x86_64/timex.h +++ b/xen/include/asm-x86_64/timex.h @@ -6,7 +6,7 @@ #ifndef _ASMx8664_TIMEX_H #define _ASMx8664_TIMEX_H -#include +#include #include #define CLOCK_TICK_RATE (vxtime_hz) diff --git a/xen/include/asm-x86_64/uaccess.h b/xen/include/asm-x86_64/uaccess.h index 3e9bc4a9bc..56a7a42aeb 100644 --- a/xen/include/asm-x86_64/uaccess.h +++ b/xen/include/asm-x86_64/uaccess.h @@ -4,10 +4,10 @@ /* * User space memory access functions */ -#include -#include -#include -#include +#include +#include +#include +#include #include #define VERIFY_READ 0 diff --git a/xen/include/hypervisor-ifs/trace.h b/xen/include/hypervisor-ifs/trace.h new file mode 100644 index 0000000000..4d267ba101 --- /dev/null +++ b/xen/include/hypervisor-ifs/trace.h @@ -0,0 +1,35 @@ +/****************************************************************************** + * include/hypervisor-ifs/trace.h + */ + +#ifndef __HYPERVISOR_IFS_TRACE_H__ +#define __HYPERVISOR_IFS_TRACE_H__ + +/* This structure represents a single trace buffer record. */ +struct t_rec { + u64 cycles; /* 64 bit cycle counter timestamp */ + u32 event; /* 32 bit event ID */ + u32 d1, d2, d3, d4, d5; /* event data items */ +}; + +/* + * This structure contains the metadata for a single trace buffer. The head + * field, indexes into an array of struct t_rec's. + */ +struct t_buf { + struct t_rec *data; /* pointer to data area. physical address + * for convenience in user space code */ + + unsigned int size; /* size of the data area, in t_recs */ + unsigned int head; /* array index of the most recent record */ + +#ifdef __KERNEL__ + struct t_rec *head_ptr; /* pointer to the head record */ + struct t_rec *vdata; /* virtual address pointer to data */ + spinlock_t lock; /* ensure mutually exlusive access (for inserts) */ +#endif + + /* never add anything here - the kernel stuff must be the last elements */ +}; + +#endif /* __HYPERVISOR_IFS_TRACE_H__ */ diff --git a/xen/include/xeno/brlock.h b/xen/include/xeno/brlock.h index 208c457338..96bfe4ac55 100644 --- a/xen/include/xeno/brlock.h +++ b/xen/include/xeno/brlock.h @@ -38,12 +38,12 @@ enum brlock_indices { __BR_END }; -#include +#include #ifdef CONFIG_SMP -#include -#include +#include +#include #if defined(__i386__) || defined(__ia64__) || defined(__x86_64__) #define __BRLOCK_USE_ATOMICS diff --git a/xen/include/xeno/byteorder/big_endian.h b/xen/include/xeno/byteorder/big_endian.h index b84efd74c9..c3c0ecdf72 100644 --- a/xen/include/xeno/byteorder/big_endian.h +++ b/xen/include/xeno/byteorder/big_endian.h @@ -8,7 +8,7 @@ #define __BIG_ENDIAN_BITFIELD #endif -#include +#include #define __constant_htonl(x) ((__u32)(x)) #define __constant_ntohl(x) ((__u32)(x)) @@ -63,6 +63,6 @@ #define __cpu_to_be16s(x) do {} while (0) #define __be16_to_cpus(x) do {} while (0) -#include +#include #endif /* _LINUX_BYTEORDER_BIG_ENDIAN_H */ diff --git a/xen/include/xeno/byteorder/little_endian.h b/xen/include/xeno/byteorder/little_endian.h index 1431663621..bdc276ba3c 100644 --- a/xen/include/xeno/byteorder/little_endian.h +++ b/xen/include/xeno/byteorder/little_endian.h @@ -8,7 +8,7 @@ #define __LITTLE_ENDIAN_BITFIELD #endif -#include +#include #define __constant_htonl(x) ___constant_swab32((x)) #define __constant_ntohl(x) ___constant_swab32((x)) @@ -63,6 +63,6 @@ #define __cpu_to_be16s(x) __swab16s((x)) #define __be16_to_cpus(x) __swab16s((x)) -#include +#include #endif /* _LINUX_BYTEORDER_LITTLE_ENDIAN_H */ diff --git a/xen/include/xeno/byteorder/pdp_endian.h b/xen/include/xeno/byteorder/pdp_endian.h index 618631cbc6..9f4f983731 100644 --- a/xen/include/xeno/byteorder/pdp_endian.h +++ b/xen/include/xeno/byteorder/pdp_endian.h @@ -27,8 +27,8 @@ #define __PDP_ENDIAN_BITFIELD #endif -#include -#include +#include +#include #define __constant_htonl(x) ___constant_swahb32((x)) #define __constant_ntohl(x) ___constant_swahb32((x)) @@ -83,6 +83,6 @@ #define __cpu_to_be16s(x) __swab16s((x)) #define __be16_to_cpus(x) __swab16s((x)) -#include +#include #endif /* _LINUX_BYTEORDER_PDP_ENDIAN_H */ diff --git a/xen/include/xeno/cdrom.h b/xen/include/xeno/cdrom.h index ecd4d0478a..a9cd9720b3 100644 --- a/xen/include/xeno/cdrom.h +++ b/xen/include/xeno/cdrom.h @@ -1,5 +1,5 @@ /* - * -- + * -- * General header file for linux CD-ROM drivers * Copyright (C) 1992 David Giller, rafetmad@oxy.edu * 1994, 1995 Eberhard Moenkeberg, emoenke@gwdg.de @@ -716,7 +716,7 @@ struct request_sense { #ifdef __KERNEL__ #if 0 -#include +#include #else #include #endif diff --git a/xen/include/xeno/crc32.h b/xen/include/xeno/crc32.h index 01497365db..ae8852fe4c 100644 --- a/xen/include/xeno/crc32.h +++ b/xen/include/xeno/crc32.h @@ -7,7 +7,7 @@ #ifndef _LINUX_CRC32_H #define _LINUX_CRC32_H -#include +#include /* The little-endian AUTODIN II ethernet CRC calculation. N.B. Do not use for bulk data, use a table-based routine instead. diff --git a/xen/include/xeno/etherdevice.h b/xen/include/xeno/etherdevice.h index bac9b4d5ad..42fd14b18c 100644 --- a/xen/include/xeno/etherdevice.h +++ b/xen/include/xeno/etherdevice.h @@ -24,7 +24,7 @@ #ifndef _LINUX_ETHERDEVICE_H #define _LINUX_ETHERDEVICE_H -#include +#include #ifdef __KERNEL__ extern int eth_header(struct sk_buff *skb, struct net_device *dev, diff --git a/xen/include/xeno/genhd.h b/xen/include/xeno/genhd.h index 58a1734a56..f60cfb0236 100644 --- a/xen/include/xeno/genhd.h +++ b/xen/include/xeno/genhd.h @@ -56,7 +56,7 @@ struct partition { } __attribute__((packed)); #ifdef __KERNEL__ -/*# include */ +/*# include */ struct hd_struct { unsigned long start_sect; diff --git a/xen/include/xeno/hdreg.h b/xen/include/xeno/hdreg.h index 703b750110..a1406aa043 100644 --- a/xen/include/xeno/hdreg.h +++ b/xen/include/xeno/hdreg.h @@ -650,7 +650,7 @@ struct hd_driveid { /* * These routines are used for kernel command line parameters from main.c: */ -#include +#include #if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) int ide_register(int io_port, int ctl_port, int irq); diff --git a/xen/include/xeno/if.h b/xen/include/xeno/if.h index 8d3fc2b7fc..f7908a366a 100644 --- a/xen/include/xeno/if.h +++ b/xen/include/xeno/if.h @@ -19,8 +19,8 @@ #ifndef _LINUX_IF_H #define _LINUX_IF_H -#include /* for "__kernel_caddr_t" et al */ -#include /* for "struct sockaddr" et al */ +#include /* for "__kernel_caddr_t" et al */ +#include /* for "struct sockaddr" et al */ /* Standard interface flags (netdevice->flags). */ #define IFF_UP 0x1 /* interface is up */ diff --git a/xen/include/xeno/if_vlan.h b/xen/include/xeno/if_vlan.h index d3e96bc4cf..9ffc01474c 100644 --- a/xen/include/xeno/if_vlan.h +++ b/xen/include/xeno/if_vlan.h @@ -23,8 +23,8 @@ struct packet_type; struct vlan_collection; struct vlan_dev_info; -//#include /* for proc_dir_entry */ -#include +//#include /* for proc_dir_entry */ +#include #define VLAN_HLEN 4 /* The additional bytes (on top of the Ethernet header) * that VLAN requires. diff --git a/xen/include/xeno/init.h b/xen/include/xeno/init.h index 5c4477f18c..554fe7fc82 100644 --- a/xen/include/xeno/init.h +++ b/xen/include/xeno/init.h @@ -1,7 +1,7 @@ #ifndef _LINUX_INIT_H #define _LINUX_INIT_H -#include +#include /* These macros are used to mark some functions or * initialized data (doesn't apply to uninitialized data) diff --git a/xen/include/xeno/interrupt.h b/xen/include/xeno/interrupt.h index 72a134c716..b044705de2 100644 --- a/xen/include/xeno/interrupt.h +++ b/xen/include/xeno/interrupt.h @@ -2,10 +2,10 @@ #ifndef _LINUX_INTERRUPT_H #define _LINUX_INTERRUPT_H -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/xen/include/xeno/mii.h b/xen/include/xeno/mii.h index b34058ada7..55bcbaff1a 100644 --- a/xen/include/xeno/mii.h +++ b/xen/include/xeno/mii.h @@ -8,7 +8,7 @@ #ifndef __LINUX_MII_H__ #define __LINUX_MII_H__ -#include +#include /* Generic MII registers. */ diff --git a/xen/include/xeno/module.h b/xen/include/xeno/module.h index 5e8ce698d6..468515ce74 100644 --- a/xen/include/xeno/module.h +++ b/xen/include/xeno/module.h @@ -7,9 +7,9 @@ #ifndef _LINUX_MODULE_H #define _LINUX_MODULE_H -#include -#include -#include +#include +#include +#include #ifdef __GENKSYMS__ # define _set_ver(sym) sym @@ -18,7 +18,7 @@ #else /* ! __GENKSYMS__ */ # if !defined(MODVERSIONS) && defined(EXPORT_SYMTAB) # define _set_ver(sym) sym -# include +# include # endif #endif /* __GENKSYMS__ */ @@ -303,7 +303,7 @@ extern struct module __this_module; #define MOD_IN_USE __MOD_IN_USE(THIS_MODULE) #if 0 -#include +#include static const char __module_kernel_version[] __attribute__((section(".modinfo"))) = "kernel_version=" UTS_RELEASE; #ifdef MODVERSIONS diff --git a/xen/include/xeno/notifier.h b/xen/include/xeno/notifier.h index 0db9736c11..cedb68689f 100644 --- a/xen/include/xeno/notifier.h +++ b/xen/include/xeno/notifier.h @@ -9,7 +9,7 @@ #ifndef _LINUX_NOTIFIER_H #define _LINUX_NOTIFIER_H -#include +#include struct notifier_block { diff --git a/xen/include/xeno/pci.h b/xen/include/xeno/pci.h index 0c45623eab..e389b00ef4 100644 --- a/xen/include/xeno/pci.h +++ b/xen/include/xeno/pci.h @@ -305,7 +305,7 @@ /* Include the ID list */ -#include +#include /* * The PCI interface treats multi-function devices as independent @@ -328,11 +328,11 @@ #ifdef __KERNEL__ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* File state for mmap()s on /proc/bus/pci/X/Y */ enum pci_mmap_state { diff --git a/xen/include/xeno/reboot.h b/xen/include/xeno/reboot.h index 5f128a9525..6705139108 100644 --- a/xen/include/xeno/reboot.h +++ b/xen/include/xeno/reboot.h @@ -32,7 +32,7 @@ #ifdef __KERNEL__ -#include +#include extern int register_reboot_notifier(struct notifier_block *); extern int unregister_reboot_notifier(struct notifier_block *); diff --git a/xen/include/xeno/skbuff.h b/xen/include/xeno/skbuff.h index 4325deb4ae..4ea39cc636 100644 --- a/xen/include/xeno/skbuff.h +++ b/xen/include/xeno/skbuff.h @@ -14,16 +14,16 @@ #ifndef _LINUX_SKBUFF_H #define _LINUX_SKBUFF_H -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include -#include +#include #include /* skb_type values */ diff --git a/xen/include/xeno/socket.h b/xen/include/xeno/socket.h index 92e7b93ae5..69636e7f06 100644 --- a/xen/include/xeno/socket.h +++ b/xen/include/xeno/socket.h @@ -4,9 +4,9 @@ #if defined(__KERNEL__) || !defined(__GLIBC__) || (__GLIBC__ < 2) //#include /* arch-dependent defines */ -#include /* the SIOCxxx I/O controls */ -//#include /* iovec support */ -#include /* pid_t */ +#include /* the SIOCxxx I/O controls */ +//#include /* iovec support */ +#include /* pid_t */ typedef unsigned short sa_family_t; diff --git a/xen/include/xeno/spinlock.h b/xen/include/xeno/spinlock.h index 08f2eb6098..a6e7fa5e4e 100644 --- a/xen/include/xeno/spinlock.h +++ b/xen/include/xeno/spinlock.h @@ -93,7 +93,7 @@ typedef struct { } spinlock_t; #define SPIN_LOCK_UNLOCKED (spinlock_t) { 0, 25, __BASE_FILE__ } -/*#include */ +/*#include */ #define spin_lock_init(x) do { (x)->lock = 0; } while (0) #define spin_is_locked(lock) (test_bit(0,(lock))) diff --git a/xen/include/xeno/string.h b/xen/include/xeno/string.h index 71ab1c4ef8..6bba29790a 100644 --- a/xen/include/xeno/string.h +++ b/xen/include/xeno/string.h @@ -5,8 +5,8 @@ #ifdef __KERNEL__ -#include /* for size_t */ -//#include /* for NULL */ +#include /* for size_t */ +//#include /* for NULL */ #ifdef __cplusplus extern "C" { diff --git a/xen/include/xeno/timer.h b/xen/include/xeno/timer.h index dcde75b182..4c1ff6d43c 100644 --- a/xen/include/xeno/timer.h +++ b/xen/include/xeno/timer.h @@ -1,8 +1,8 @@ #ifndef _LINUX_TIMER_H #define _LINUX_TIMER_H -#include -#include +#include +#include /* * In Linux 2.4, static timers have been removed from the kernel. diff --git a/xen/include/xeno/tqueue.h b/xen/include/xeno/tqueue.h index 3cf830d3f7..9d46fd9dff 100644 --- a/xen/include/xeno/tqueue.h +++ b/xen/include/xeno/tqueue.h @@ -13,8 +13,8 @@ #ifndef _LINUX_TQUEUE_H #define _LINUX_TQUEUE_H -#include -#include +#include +#include #include #include diff --git a/xen/include/xeno/trace.h b/xen/include/xeno/trace.h index 9268145905..fb8a214d62 100644 --- a/xen/include/xeno/trace.h +++ b/xen/include/xeno/trace.h @@ -21,32 +21,7 @@ #ifndef __XENO_TRACE_H__ #define __XENO_TRACE_H__ -/* This structure represents a single trace buffer record. */ -struct t_rec { - u64 cycles; /* 64 bit cycle counter timestamp */ - u32 event; /* 32 bit event ID */ - u32 d1, d2, d3, d4, d5; /* event data items */ -}; - -/* - * This structure contains the metadata for a single trace buffer. The head - * field, indexes into an array of struct t_rec's. - */ -struct t_buf { - struct t_rec *data; /* pointer to data area. physical address - * for convenience in user space code */ - - unsigned int size; /* size of the data area, in t_recs */ - unsigned int head; /* array index of the most recent record */ - -#ifdef __KERNEL__ - struct t_rec *head_ptr; /* pointer to the head record */ - struct t_rec *vdata; /* virtual address pointer to data */ - spinlock_t lock; /* ensure mutually exlusive access (for inserts) */ -#endif - - /* never add anything here - the kernel stuff must be the last elements */ -}; +#include #ifdef TRACE_BUFFER diff --git a/xen/net/dev.c b/xen/net/dev.c index afa85895ec..3f3d317931 100644 --- a/xen/net/dev.c +++ b/xen/net/dev.c @@ -10,24 +10,24 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/xen/net/dev_mcast.c b/xen/net/dev_mcast.c index d7d2ae338d..c460b9497e 100644 --- a/xen/net/dev_mcast.c +++ b/xen/net/dev_mcast.c @@ -21,30 +21,30 @@ * 2 of the License, or (at your option) any later version. */ -#include -#include +#include +#include #include #include #include -#include -//#include -#include -//#include -#include -#include -#include -//#include -#include -#include -#include -//#include -#include -#include -//#include -#include +#include +//#include +#include +//#include +#include +#include +#include +//#include +#include +#include +#include +//#include +#include +#include +//#include +#include //#include //#include -#include +#include //#include //#include diff --git a/xen/net/devinit.c b/xen/net/devinit.c index f3ce2c39d4..a4a5e20242 100644 --- a/xen/net/devinit.c +++ b/xen/net/devinit.c @@ -20,18 +20,18 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include static void dev_watchdog(unsigned long arg) { diff --git a/xen/net/eth.c b/xen/net/eth.c index 5238de022e..ad669feb3a 100644 --- a/xen/net/eth.c +++ b/xen/net/eth.c @@ -37,22 +37,22 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#include -//#include -#include -//#include -#include -#include -//#include -//#include -//#include -#include -#include -#include -#include -#include -#include -#include +#include +//#include +#include +//#include +#include +#include +//#include +//#include +//#include +#include +#include +#include +#include +#include +#include +#include //#include //#include //#include diff --git a/xen/net/skbuff.c b/xen/net/skbuff.c index 5fcc044c5e..c91f2d5fc2 100644 --- a/xen/net/skbuff.c +++ b/xen/net/skbuff.c @@ -32,18 +32,18 @@ * 2 of the License, or (at your option) any later version. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -- 2.30.2